Oh I just saw the OTH 6x01 promo!!!!

Click to view

I'm positive he is picking peyton, because we all know he is not picking brooke and the lindsay scene looks like an old one...*crosses fingers*